Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Tue, 29 Jun 2010 12:08:56 +0000 (12:08 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Tue, 29 Jun 2010 12:08:56 +0000 (12:08 +0000)
commit286e31852006966e5dac272ab8fbe286542c887f
treea23998cfdadf19de5b5bf087370adf0a74f23f9c
parent2f46df43aa95af8e966f9a1d7259ba1bec61b566
parent6f1e6ca9d6b9d05f59f51088a5a2d6f993d1c755
Merge from mainline.